Clean-ups in our dev compilers