More simple fixes and tweaks