A few tweaks after first test deploy