Tagged: fix error code issues