Cleanups, fixes.