Backport fixes from bootstrap branch

Signed-off-by: Michal Čihař <michal@cihar.com>