minor fixes and packages