Small tweaks and fixes