Further fixes for issues found by Christina.