Different Fixes in the membrance functionality