Free of warnings and compile errors, finally.