A few tweaks and fixes