Fixing some simple issues.