FIX - some notices