Base: Fix minor syntax issues