Fix dronie NPE

and other small fixes