Use a withMaybe helper
Get rid of some warnings