Include code for two micro-issues from progress.o.o.