Small fixes

Hello. Just a bunch of small fixes.