Several fixes...