Some last fixes and adjustments for compilation