Small fixes to last change