Just small tweaks