Small issues found by the Validation Layers plus removing a workaround that we likely don't need anymore.