Airblader/unclutter-xfixes