Small fixes and tweaks