Fixed non unis compilation support