taking care of TODO and fixing backup script build dependencies