Fixing small issues pointed by Eduardo's review