fix: Improvements