Coulple more fixups...