Minor fixes, BOSS and Drone changes