Additiona small tweaks