Some small fixes

Nothing major, was just bored so decided to dig around