Some tweaks to make app build file work