Fix apt
Still not working, but making progress...