Minor tweaks for MMWCON