Keep compiler happy

Tests pass locally now.