Fixing errors with last commit