Fixing build setup