Fixing some problems.