Initial fixes for problem.