Fixed few resource leak issues

Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit 3c5f64c97ab071451aee7f232d8f2cec6d89044d)