. minimal fixes