ERT-480: Minor test/compile fixes.