Revert "Revert "Minor Fixes""

This reverts commit ef4f69e6f1e10241079a0935a445f7ddb20eb543.