Fixes using Functions in Dictionary