Fix cs issues introduces since git repo renaming (bot has been down)