Fixes and Debug