Fixing core functions.