Cleanup && Fixes for crashes

Signed-off-by: Chintan Shah <cgintan1998@gmail.com>