Updates after fixing Github