Clean up std namespace issues