Revert "Minor fixes"