COMP: Tweaks to get rid of INSTALL warnings