parsing fix, warnings