Base: More bug and syntax fixes