Trying to fix Git workspace problems