i3: misc changes