some fixes for 3.5