Small cleanup, npe's in non-standard installations (fuse, missing rse), etc