Fix some enters