Fix Static type checking compilation problems