COMP: trying to clean up old compilation errors / warnings