Sensu bug fixes and improvements