fixes for stability