Fix size issues