General fixes and further compliance with C++ standards.