Improve no type policy handling