Changed some return codes