Workaround lint problems