Fix up some issue