a few more crush changes, while we are at it