Minor improvements

Minor stability improvements