Random fixes and tweaks