Additional fixes

Additional fixes