Removed some warnings and notices.