Small tweaks part 2