2013-03-29: General build fixes