Minors adjustments

Thanks to @antograssiot for pointing them!