Add workaround for 'apt-get update' failure (will remove later from this branch) and more fixes