Fixed building error(s)