Fixed other errors