Some small tweaks only