Minor fixes
Revert "Minor fixes"

This reverts commit 745c06a33b87d5ff1782b7211a731d67afa96008.
Revert "Revert "Minor fixes""

This reverts commit c2f9d6e5ad24198782e82bde1caaed62a78c1e5c.