Fixes a couple of is errors with missing functions. Added isDrone as macro restored the various is non macro functions. i don't know how or if they could be macro-ized