Fixing errors and mistakes