Fixes for the Final Stage