Fix up shit