Minor fixes to match current Github setup