Fallback for git backwards compat issues, some little things