more issue fixes