Fix initial load behavior and fix namespaces