NA fix for e14q; misc stuff