Fix some permission issues. Need to simplify finding headers by string.