Fixes for building under Mirage 2.1.x