Same types of fixes as before