Fix build; support for spec 3