Bug Fixes of Main CoreCraft!