Fixing some stuff on my side
Fixing some more stuff on my side