Fix some containers