v4.01 quick fixes