Fixed minor bugs after removing top level module decs