Small fixes to previous commit