Adjustments

Signed-off-by: NicoArbogast <nicolas.arbogast@gmail.com>