Fencing fixes