10/31/2014 no7: Small fixes