Solving minor mistakes