Also fixes up some cleanup issues. Signed-off-by: Brian Goff <cpuguy83@gmail.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 1a51898d2e) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
1a51898d2e