Fixing Handle bugs