Fix overriding of props options.

Specific options should override global ones.