Some fixes to recent FieldtypeComments additions/updates