A few tweaks after the port