Fix default again...
Cleanup resources
Fix seg fault