more build issue fixes