Some minor/general tweaks