More GUI type changes