Bug 934799 - Fix compile errors (rs=jandem,a=bustage)