Minor changes on FunctionAsObject