Mirror: Fixes and improvements. Thanks to Robin!