Fix some issues?