Fixing errors...