Fixing and tweaks