Even more fixes and tweaks