Fixed warnings/notices