Fix small bug + feedback