Fixed a few bugs in Handles plugin