Removed those pesky singleton variable warnings.