Address some small issues I found when implementing a bigger feature
Nothing in here should be risky, sending separately to be able to send a more interesting MR later on.
Edited by Aleix Pol Gonzalez
Nothing in here should be risky, sending separately to be able to send a more interesting MR later on.