Changes required for GNU toolchain build. See motor project submission pushed just before this one.