Fix portoflio issues (debugging code was being called even when tag was off)