Stupid errors fixes