Some minor fixing
Needed to do this commit since a broken commit accidentally ended up on
development.