fix compile bugs

Merged Chris Hines requested to merge dev into prod

Merge request reports