Fixes and package updates