Some fixes to obsolete code