Some minor fixes

Just some random fixes.