Fixes broken features, whoops