Fixes to broken code.