fixes for builds