Some handling fixes.