Fix small needs