Bring back some of the old compiler stuff