V1 Fix Ups

Many more to come.