More fixes after minor refactor
More fixes after minor refactor

brookehus/msmbuilder,rmcgibbo/msmbuilder,msultan/msmbuilder,dr-nate/msmbuilder,dr-nate/msmbuilder,msmbuilder/msmbuilder,cxhernandez/msmbuilder,Eigenstate/msmbuilder,rmcgibbo/msmbuilder,brookehus/msmbuilder,cxhernandez/msmbuilder,msmbuilder/msmbuilder,brookehus/msmbuilder,rafwiewiora/msmbuilder,msultan/msmbuilder,cxhernandez/msmbuilder,msultan/msmbuilder,brookehus/msmbuilder,cxhernandez/msmbuilder,stephenliu1989/msmbuilder,msmbuilder/msmbuilder,stephenliu1989/msmbuilder,msultan/msmbuilder,dr-nate/msmbuilder,msmbuilder/msmbuilder,mpharrigan/mixtape,mpharrigan/mixtape,dotsdl/msmbuilder,Eigenstate/msmbuilder,cxhernandez/msmbuilder,Eigenstate/msmbuilder,mpharrigan/mixtape,rafwiewiora/msmbuilder,peastman/msmbuilder,msultan/msmbuilder,dotsdl/msmbuilder,mpharrigan/mixtape,rafwiewiora/msmbuilder,rafwiewiora/msmbuilder,msmbuilder/msmbuilder,Eigenstate/msmbuilder,brookehus/msmbuilder,mpharrigan/mixtape,dr-nate/msmbuilder,peastman/msmbuilder,stephenliu1989/msmbuilder,peastman/msmbuilder,rmcgibbo/msmbuilder,dr-nate/msmbuilder,rafwiewiora/msmbuilder,peastman/msmbuilder,stephenliu1989/msmbuilder,Eigenstate/msmbuilder,dotsdl/msmbuilder,peastman/msmbuilder,dotsdl/msmbuilder,rmcgibbo/msmbuilder