Minor Tweaks, temporary fixes