[#18] Build fixes