Minor improvements (pending changes on local git)