Fixes and new app debug