some more fixes for 3.3.1