Fix different sizing issues