Fixing build
Fixing complexity