Some fixes for mass input