bug fixes & improvements for enterprise