Some minir fixes