Fix shifts; fix bounds