Adding recent fixes/changes