Small tweaks I can't quite recall... :/