Last fixes and tweaks