Small fixes and height clipping