v4.05 quick fixes