Fix warnings/notices