Fixed building config issues