A couple application specific changes...