Fixs from PR (excluding reflection changes)