Various exhausting fixes.