Minor edit for some classes to avoid breaking stuff