Style apply and crash fixes