Removed some warnings...