Same for all the other problems, making fixes for the moment :)