resolving metas / other misc fixes for compilation in 2.3.2.2