added dummy activate/deactivate, null pointer fix