Some hopefully final amends