Fix. Some fixes: 930, 933, 934, 935