Some minor fixes to previous commits