Added a few missing changes...