More warning fixin'