Build errors fix