another minor fixes pack