Hacky fixes for 12, since it doesnt respect return context pri