some tweaks to make sure the input format class gets picked up correctly