Minor fixes 2014 apr22