More fixes

More fixes for firefox and CVC input