More fixes for 'pm' and '/m'