Fix up features and stuff