Several fixes on style