Plugwise fixes (see email on mailing list)