Fix packages and format