Tweaks for APT used by EM