make modifications to prevent warnings