mock plugin fixes