Warning and lint cleanup