Try to fix some issues