Fixes enriching and beaming