Recent fixes
changes