Minor changes
Squashed yet another bug