The last fixes just in order to run the app