Fixing some stuff from migrating to github