Small changes to define-library