Some more fixes for activation