some fixes for sidecars