Some missing updates.

Some missing updates, related with last commit (17102013).