More QIP fixes for tonight