Small issues - batch 2