Everywhere: multiple bug fixes