Fixed some handler issues