Fix static assert errors