Update compatibility to 1.3

A series of commits coming to bring this up to 1.3 compatibility