Further fixes.

Some more fixes that both me and gsmark missed.