Yet more changes for small devices