some fixups from adw