Don't export activity + bugfix