A few fixes, still doesn't solve the problem.