Fix some Switch issues