Fixed Serius issues