Add in Admiral logic and fix small NPE