A couple misc. bugfixes
Possible a layout test got committed by mistake.