SUP 307 compatcheck fixes