A few tweaks to support tighter integration