Hopefully fixing some errors