Fix minors bugs in Activities