Fixes and stuff like that