Small fixes for the reported notices/warnings