Final changes to improve on the compatibility with smaller devices.