fixes from q4