Fixes and stuff..