More smaller device optimisations