enterprise - some bugs fixed