Resolves an issue where bearings would not spawn.
Merge branch 'minor-fixes-06-2'