Cleaner
Fix some crashes