Ongoing fixes: