Small cleanups
Export exception types