Making build pass