Add suggestes fixes from GieltjE #1890