Fixed some issue with Keith