BM: Some small additions.