Fixed almost errors