Couple of fixes so plugin will pass Strict checks.