Fixing build on 1.8.7 and ree