Minor fixes, and i3 support to xinitrc