Fix stability issues