Fixed things before attempting to rebase