essential fixes