Revert "Minor updates"

This reverts commit 5249ce25c419745cfd38b2a58ed53068b2f63525.