#4632: Little things to make this work.
#4632: what progress I have made