Fixed a few errors. Util fixed thanks to @Phengus
Signed-off-by: Advtech <daniel.sapelli@gmail.com>