Just some small tweaks