Minor: Improvements

Few improvements.