fixed issues blocking build