try fixing some issues