Fixes for github organization #382