Fixes few notices