Fixed pet bugs