Several small tweaks