Cleanup some alignment issues.