More cmake install fixes