More rem fixes