Bugfixes.

Bugs related to the updated function and something secret.