improvements to hopefully make things build