Some weird fixes, don't know what I am doing