Removed singleton warnings