Fix some notices