Some final fixes

Some final fixes