Small bugfixes

This probably didn't warrant its own branch.. just some small cosmetic bug fixes