Fix too many things to explain