Small changes due to library changes.