Screaming Loaf: Bug fixes.

Bug fixes.