Fixing some more stupid bugs that cropped up from testing`