another minor fixes