Fix some more problems found when hooking everything up together