Little fixes and tweaks