Fixed a few nick handling bugs