Fixes for build error