Some fixes (syntax errors and other issues...)