Fix problems with pmuir/aweplug master