More small fixes
Fixing a few more