Activities logic fixes