Add some emms tweaks