Build issues

Fixing missing std:: and includes