Fixups; cleanups