Fix: Add remaining changes for previous commit