Revert "Revert "Revert "Minor changes"""

This reverts commit 03b7a7d6c2ee910ccb472cdf27841f7d08e9c590.