uplinkCoder's fixes for building with 2.065