fixes for q4