General fixes.