Add missing fixes for previous commit

Authored by nicolasfella on Jun 22 2019, 3:56 PM.