Small fixes based on @hwoarangmy's input. :)