some mre fixes