Minor fixes to be amended into "rename" commit