WAM Fixes