[Nathan] Fixed buildpaths and added Madigan's health changes