Fix GB breaks + Lint notices