IM: Fixing build errors as reported by GitHub