Updates and fixes for 7QBW