Some more tweaks and fixes