Minor fixes, Sat May  3 12:18:31 UTC 2014