A few modifications to correct bridge accessors and slightly better behaviors for exiting