a few compatibility/flexibility tweaks