Revert last commit, new fixes