Another fix for some errors