Fixed loader bugs.

These are already in production, so I'm merging it in.