Doing some more fixes Update #4