Temp fix for build errors