Fixes for last 4 build failures