Small tweaks and fixes all around the place