Fix some issues with shifting on release.