Fix some lints for base.gs.
Merge branch 'fix_base'