Fixed sizing issues