Fixed last issues with Switch