general fixups