Fix a few handles