Fixed some minor right click bugs