Address comments for dev version 21