Try to fix a few errors