More Bug Squashing

Signed-off-by: Jamie White <hello@jamie-white.com>
Merge branch 'terry-demo-2-rock-race' of https://github.com/RhythmDigital/rhythm-terry into terry-demo-2-rock-race