more viewport fixes