Added fixes from Giaco
Removed using std in .h