Stability enhancements

Small fixes to small performance bugs resolved.