Cleaned up multiple warnings