some more build issue fixed