Squashes another few smal bugs