Resolved compilation errors. Continuing to port.