Revert "Minor fixes"

This reverts commit 02dbbfc4eee3535607b758fbdaae0ea8be6c7a49.
Minor fixes

Works like a charm now