Fixed errors after updates