Unfencing fixes