Various USE changes

Should help solve bugs:
#4237
#1788