Multiple tweaks and fixes