Fixing more bugz.
Moar fixes.