Fixed activation depth and some more