Revert "Fixes and small changes"