Fix #5 notices