Fixes from feedback of 3.0-alpha3