Fixes for olapic

Needed for Olapic. 

Next step:
Remove the Inflector class.