Fixes as applied from original sources.