A number of minor fixes to remove unsupported input types.