merge in some monetas work for cmake