Misc fixes 20130409