Fix bugs in Experience Manager helpers