Adding changes to fix errors