Some weird fixes