Subject resolution fixes