Applied patches from fabbot.io