Update some more things on function application