Compatibility edits

Minor tweaks