Various overlay fix-ups for ApexQ