Various fixups