A few tweaks while looking over the top level entry point