Bla bla some fixes