Fix issues with Raceway