Couple fixes for the definitions