Fixes to core method.