Fixes and tweaks