The obvious few bug fixes