Fixes on new functions.