Export Bug Fixes