Some fixes to the default function values