More Fixes

This addresses a few issues reported in the comments on bukkitdev.