General tweaks and adjustments.