Fixed things to allow save activities