Container height adjustment fixes