Fix static call issues while activating. Refactor