activity bugfixes