V12 final fixes

last round of goodness