Some fixes to the fence