Fixing #20: compatibility fixes