Activities responsive fixes