Fixed some size issues