Some small fixes and stuff