Fix some error on entries