A few additions exposed after running some tests. [0]