Batlab build improvements