Fixed misc interest issues