Fix: broken features