Better activation checks. Closes #307