Fixes annoyances with activities