Fixes from linquize <notifications@github.com>