Add fixes for the upcoming shorthand resolver