Shorthand fixes