Github issue fixes