Fixed compilation errors
Respecting my own RFC would be a good idea