Revert "Minor Fixes"

This reverts commit 4e24021daa18e265a6cc5e54a07b133fccb2cfd8.