Fixes for 7"