[Issues] Some segfaults fixed.