Fixed build-breaking bugs

Still fighting with crServo...