Make some small tweaks