Fix static height bugs