Fixes related to failing unit tests.