Revert "Minor Fixes"