Oops, how did I manage to forget those… Fixed those in Code just now.
Yes there is already a TODO about that one…