Small changes for compatibility with new pelica