Some Mechlist tweaks