[core] Minor Bug Fixes