Fixes for use with CWA