Fixes for builds