Fixes shell references