Default mining algo fix, Branch merge fix