Changes for better support of small devices