More i3 changes