Fixes for utility functions.

Signed-off-by: Norv <a.w.norv@gmail.com>