Added fixes from lib/compiler/.