Fix baby induced compilation problems