Fixes and Debug stuff