Fixed bugs involving Bundle arguments.