Made fixes to Github token related errors