Fix GUI types and add missing types

Closes PR 14503
Closes PR 14507