Fixed bugs passing bundles across activities