More compiler work