0.0.2 fixes

Signed-off-by: Vandeuren Glenn <vandeurenglenn@gmail.com>