Devon form fixes