fixes for -m