Minor changes to behavior methods.