Removed some warning messages