Fixes and additions for some GUI class types