fixed issues on build