Minor changes to be committed

See TODO list