minor fixes x 2