Cosmetic modifications, fixed deadlock