Fixes in corebar