fixes and packages