minor changes to start fixing compatibility issues