more build fails fixed, hopefully