Fixes for smaller devices