more static parsing fixes