Fixes for landscape (finally)