a few fixes to get maq caller working again