Deactivated incomplete features and bug fixes