Required fixes.