Various changes to improve the situation