Address issues in gh