Fixed building issue(s)