Hotfixes - improved stability