some issue fixes