General Tweaks/fix ubers