Checkout from git log and other fixes