Potential fix(es) for #1170