Adapted code to latest repo changes (compile only).