A couple more fixes for CMA04-1