Updates for PAM EM measurements, small fixes