system-usr and hubernate fixes for xfce