Fixed declaration issues.