Some Git troubleshooting