onboard bug fixes