More security for viewport support