Fixed SidecarController bugs