More fixes and packages