Fix multiple problems.