Minor changes. Safety commit.