Fixed build for APM2 Beta hardware