Further Fixes for resubmit