Fixing two small issues

@hwoarangmy Could you?

It would be your turn for once. ;)