Small changes to fix notices