Fixing build constraints