Misc fixes 20130408