Several bigs fixes.