Further improved compatibility to prevent some warnings