Minor fixes to personal core code.