Fixing Git issues