Inventory mangement fixes + minor connection fix