Some Fixes and stuff