Minor changes throughout the whole system