1487 some fix and wait for MC1.8