Fixed input size issues