Fix intentional bugs, Drone should be happy