1. minor fixes