Fix some classes in order to get a better interaction with applicatio