various fixes for eric