Fixes in apt/