[work in progress] gril warning fixes