Better syntax
Some more fixes
Fix
Fix