0.10.0 enterprise copy, minor bug fixes