Removed additional warnings