Fix overlooked details