Additional clean up / minor fixes