Some more work for stability and test coverage