Miscellaneous hot fixes.