Fix some issues after moving utilities module.