Small fixes for stability