Small fixes for i3