Minor fixes/improvements.

Signed-off-by: Kalman Olah <hello@kalmanolah.net>