Fixed Stonecutter issues