things mentioned in #372