Fix some overly strict stuff
Fix script/your-app