Minor changes regarding how activities are started.