Revert "Minor updates"

This reverts commit 1d4d9a6572084041c5c74347a95adc53b42ffcf4.