Misc fixes - vivid project bugherd run-through to capture missed items.