Update for wp3.7 and error fixes

Signed-off-by: Alysson Bortoli <akbortoli@gmail.com>