Fixing error's