Improvements to core code.