fixup shorthands