FIX some errors