Minor cleanup
Fixing some issues.