Some generic fixes.