Various small fixes

lolwut