Smalls i3 improvements