more build changes so CI can run properly