BLD-468: Fix bugs.