Fix some issues with APT packages