I've been without access to my computer for a week so hadn't had the chance to play with this but I can confirm that your fix has worked - the app now builds from the latest commits.