Fix couple definitions