Bug fixes, exports.