fix for some errors