HappyMapper & ROXML fixes