Minor changes, package updates