Fixes for various issues - still segfaulting