general fixups, nothing to worry about