Random fixes for potential crahes