Add suggestions from @antgonza and @teravest