General fixes.
General fixes