Relevant bug fixes from Maestro client.