Added random fixes

This is really a pretty pointless commit.