Minor fixes to last patch