Few minor fixes and one patch more